| commit | b69c7b025f8f81e579a4cbfb05876302fb6f964e | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Wed Oct 18 10:14:15 2023 -0700 |
| committer | Maciej Żenczykowski <maze@google.com> | Wed Oct 18 17:22:54 2023 +0000 |
| tree | d17266445089b30c3279b0b876e8cdcbabc0d110 | |
| parent | 41d4d25f0c5d7634bb6e76e07e97cfaf759b7d7b [diff] | |
| parent | 63749e89a33e17855dec755ac1671056123578d4 [diff] |
Merge remote-tracking branch 'aosp/main' into HEAD * aosp/main: macsec: fix off-by-one when parsing attributes Fix duplicate symbols error in external/iproute2 Move OWNER reference master=>main. [NFC] Move MTE mode settings to a product variable. Specify which M4 to use with bison Ignore-AOSP-First: this is a merge from AOSP Bug: 305814576 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ib548ce5bdc796d3efe8c462546bab0a02732da4b